Merge branch 'master' into treeview-refactor
authorTristan Van Berkom <tristan.van.berkom@gmail.com>
Sat, 23 Oct 2010 04:25:45 +0000 (13:25 +0900)
committerTristan Van Berkom <tristan.van.berkom@gmail.com>
Sat, 23 Oct 2010 04:25:45 +0000 (13:25 +0900)
1  2 
gtk/Makefile.am

diff --cc gtk/Makefile.am
Simple merge